From b1b58fe3df6eade4df98bdee0c55549d71bd5c78 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 13 Mar 2004 20:44:14 +0000 Subject: [PATCH] Don't do anything beyond clearing to the background if there is no active Sat Mar 13 21:47:47 2004 Matthias Clasen * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything beyond clearing to the background if there is no active row. (#137066, reported by Owen Taylor) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcellview.c | 8 +++++--- 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85a440b9eb..486506e659 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 13 21:47:47 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything + beyond clearing to the background if there is no active row. + (#137066, reported by Owen Taylor) + Sat Mar 13 21:37:44 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 85a440b9eb..486506e659 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Mar 13 21:47:47 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything + beyond clearing to the background if there is no active row. + (#137066, reported by Owen Taylor) + Sat Mar 13 21:37:44 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 85a440b9eb..486506e659 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Mar 13 21:47:47 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything + beyond clearing to the background if there is no active row. + (#137066, reported by Owen Taylor) + Sat Mar 13 21:37:44 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 85a440b9eb..486506e659 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Mar 13 21:47:47 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything + beyond clearing to the background if there is no active row. + (#137066, reported by Owen Taylor) + Sat Mar 13 21:37:44 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 85a440b9eb..486506e659 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Mar 13 21:47:47 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything + beyond clearing to the background if there is no active row. + (#137066, reported by Owen Taylor) + Sat Mar 13 21:37:44 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 5f8465a803..c0efb0c1b3 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -437,9 +437,11 @@ gtk_cell_view_expose (GtkWidget *widget, g_object_unref (G_OBJECT (gc)); } - /* set cell data (if applicable) */ - if (cellview->priv->displayed_row) - gtk_cell_view_set_cell_data (cellview); + if (!cellview->priv->displayed_row) + return FALSE; + + /* set cell data */ + gtk_cell_view_set_cell_data (cellview); /* render cells */ area = widget->allocation; -- 2.30.2